Merge branch 'giuseppe/staticdeltas' of https://github.com/giuseppe/ostree
authorColin Walters <walters@verbum.org>
Fri, 19 Dec 2014 21:31:31 +0000 (16:31 -0500)
committerColin Walters <walters@verbum.org>
Fri, 19 Dec 2014 21:31:31 +0000 (16:31 -0500)
1  2 
src/libostree/ostree-core-private.h
src/libostree/ostree-core.c
src/libostree/ostree-repo.c
src/libostree/ostree-repo.h

Simple merge
Simple merge
Simple merge
Simple merge